Upstream merge#36
Merged
Merged
Conversation
…e clash with other extensions
…ld-versions Add CSRF token and drop support old versions
Fixes BS5 class and add CSRF support to all forms
String prefix cleanup
BIO-6709
CKAN 2.11 support
…x showing delete and update showcase buttons
Update MANIFEST.in to include migration files and public assets
Fixes delete and update showcase buttons
Clean up c object
fix: remove deprecated highlight_actions-attribute
…-merge # Resolved conflicts: # .github/workflows/test.yml # ckanext/showcase/assets/js/slick.js # ckanext/showcase/fanstatic/resource.config # ckanext/showcase/model/__init__.py # ckanext/showcase/plugin.py # ckanext/showcase/templates/header.html # ckanext/showcase/templates/showcase/new_package_form.html # ckanext/showcase/templates/showcase/read.html # ckanext/showcase/utils.py
![orca-security-us[bot]](https://avatars.githubusercontent.com/in/276250?s=60&v=4){kind=small}
There was a problem hiding this comment.
Orca Security Scan Summary
| Status | Check | Issues by priority | |
|---|---|---|---|
 Passed |
Infrastructure as Code |  0  0  0  0 |
View in Orca |
| Passed |
Secrets | 0 0 0 0 |
View in Orca |
| Passed |
Vulnerabilities | 0 0 0 0 |
View in Orca |
peterVorman
force-pushed
the
upstream-merge
branch
from
1da724b to
b82827b
Compare
peterVorman
force-pushed
the
upstream-merge
branch
from
b82827b to
c5dc278
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.